Etch-and-rinse approach